Add a couple of tests