Fix failing tests

All tests pass for me.