Fixed sonar reported issue
Added more integration tests on java del