refactor (test): Tidy up tests some more