get a few more tests passing