Now passes a few more tests