More builder tests, cleanup.