Add in a few more tests