Added some tests, have a few more in the works