Continue refactoring the tests #domainwatchman

cleanup and refactor code for code review, ensure all tests pass, clean and remove old tests #consulting

Code cleanup and write unit tests #pingbot