More Builder work, mostly finished, cleaning up tests