Added FluidValidator with unit test