Test changes to accomodate KeyStore api changes