Kido Offline fix and tests improved