Adding some more tests