Refactor the test tests too