Get a few more tests passing