Adding test and updating index