mario,praveen|refactoring and enhancing integration test