More bug fixes
Added a test case for index update