Added tests for key/person gateways as well as updating friend/person to
aid fixing mappers