Added more tests
Added checks for independent copies https://github.com/mWater/mwater-portal/issues/226