Fixed up source code for the builder test, removed debug code