Add a few more tests