Fixes in test cases connection manager and entity

Fixes in test cases connection manager and entity classes