Missing some fixes to pass the test suite, almost there