Split UATBuilder out of UAT