Added some more tests!