Renamed the test package.
Merge remote-tracking branch 'origin/master'
Added junit to pom.