Updated for latest UberTest