Re-awesoming the DrinkingTest.