TEST Omnibus upgrade