Merge pull request #382 from iameric1986/master

More Junit tests
Merge pull request #383 from iameric1986/master

Changed the name of a test class
I WIN