All tests pass -- UATBuilder needs changed