Updated the JUnits and the test data
Merge remote-tracking branch 'origin/master'