added some tests for some of the new functions and fixed problematic cfg_test stuff
fixed mergeBuilder issues