Add assertj-core in test dependencies
Merge remote-tracking branch 'origin/master' into DataManagement