cleaned test refactoring a bit more