Added unittest for testing the EntityDslScopeProvider
Refactored the ZModelDslScopeProviderUtil class