changed to run each builder in it's own job; added two more tests