fixing unit tests to salt+water stuff