refact(tests): more test refactoring