Added some more tests..