am 258e3d15: TestKeyStore: more possibilities for KeyStore creation

* commit '258e3d158c9a876307d5111972f7e9f1ad87b076':
  TestKeyStore: more possibilities for KeyStore creation