Use Builder framework for test data