Updated all tests - currently breaking builds