Fix failing tests
Another test fix