Fixed a test; adding provider object to provideWater event; some more tests