Added Some More Unit tests
Merge pull request #59 from Sotera/unit_tests2

Added Some More Unit tests