Fix all test errors