Fix some tests and remove circular dependencies. Work still needs to be done to complete key generation and use the right key type depending on which side of the connection you are on.