Merge - task : #0308 & task : #0310
task : #0310 - upgrade all UnitTest case.
test : #0309 - hashCode(), equals() for all POJOs