Merge "Fix KeyStoreTest now that begin requires parameters."