Cleanup and add tests for 100% of builders/builder.js, bringing overall statement coverage to 60%, and branch coverage to almost 50%.