Since water is now properly supported (i.e. TIP3P, SPC), some of the tests should utilize water to test this handling.