refactoring in test classes, separate builders by test classes