Client now uses genserver correctly
Updated tests