Merge "Basic Keystore availability test"