Pass builder to callback so user can cleanup

The test is in a tmp dir that will be destroyed so it doesn't want the
build calling cleanup
Better output for travis
I didn't like changing what Given meant