Added more unit tests
Merge pull request #74 from Sotera/unit_tests

Added more unit tests