Adding tests for the builder
Merge remote-tracking branch 'origin/master' into updates-and-tests
Merge pull request #7 from sylphon/updates-and-tests

Adding test coverage for the builder