Some corrections in catalog index manager and submanagers and their unit tests