Add in more tests