Updated to the latest fluid version, fixed the tests