Merge "Added keypairs negative tests, removed unused client objects"