Adding in more tests