Updated unit tests at the behest of Wolvereness