Refactor tests

Improve GenerateKeyPairTest()
Rename some methods to match what's actually being tested