Fix the unit tests that @cvan broke