Add a couple more tests