Implemented fluids in the test generator