handle timeouts better, reenable state test, call deltaInit