Also fix the tests