Reorganize fixtures
Use new Builder instance for each unit test