Changing the tests around
WIP refactor of a refactor