Adding some more tests....