Adding some Builder tests