Updated all tests