Separated  acceptance test builders to allow testing per builder