Implemented/Refactored water sample model methods factor and to_hash in order to pass all current unit tests.