added relevant tests and removed water
Small amount of refactoring, as well as a few more tests