Fix exceptions in tests
Fix another test failure