Fix for JKS file. Minor improvements in integration test