Added more tests for water sample model methods factor and to_hash.