default index state fixed, tests fixed.