Removed DrinkDataTest, as all it's methods are tested by DrinkDbTest.
Fixed a bunch of tests.