Augh, I so don't want to do that much more typing. =) Let's open a JIRA for cleaning up tests across the board for that.