refactor (test): Tidy up tests