Fix all tests again