Change from include to import as lckmgr and kvs
Fix tests to check the internal state of XKVS after the correct tick(s)