support for server generated keys.  more/better tests