Adding some more tests...