Add a couple of more tests