Fix tests
Merge pull request #202 from carterpage/better_builder

Fix tests