Fixes for hex client tests