Added and fixed all of our unit tests
Merge latest into branch
Merge branch 'master' into unit_tests1
Merge pull request #57 from Sotera/unit_tests1

Unit tests