refactor: reduce internal interdependences and DRY up code

[richrdkng]

• src: DRY up and improve modularity and testability
• tests: DRY up and separate cross-existing cases