Fix the tests that cvan broke