Unit test cleanup, plus 1 more line!