JUnit Tests
Merge pull request #36 from Kirstyvox/master

JUnit Tests