Fixing merge conflict
Fixing merge conflict

Merge remote-tracking branch 'upstream/master'
Merge pull request #382 from iameric1986/master

More Junit tests
Changed the name of a test class
Merge pull request #383 from iameric1986/master

Changed the name of a test class
Merge remote-tracking branch 'upstream/master'