Added some more tests
* Testing is good!