Finished unit tests pertaining to latest changes. Corrected 2-3 bugs as a result of running the tests.