Pass a few more tests