Add a couple more basic tests