Merge "Restructured keystore2 client tests."