Refactoring unit test organization