More minor cleanups + testing of file builder + config builder