Merge "Add KeyChainTest and require certain algorithms"