Fix the test errors See #32