Added a few more useful unit tests, and removed a redundant method.