Fixing integration test failures due code coverage and wrong keystore reference