Added unitTest for entityFactory
Merge remote-tracking branch 'origin/feature/openid-connect' into feature/openid-connect