Modified tests to support changes in index