ESB integration Tests core chenges

Basic fixed for the test structure of ESB integration tests