Refactor tests

Refactor all tests into a script manageble namespace