Support for testing stuff
Compartmentalised testing stuff a bit
fix merge
Merge remote-tracking branch 'origin/wip-testing'

Conflicts:
	renew-domains.cabal