Added a few tests
And here are the tests!