Finally make all tests pass