Refactoring test to builders
Merged tests into simple class with builders