Update and rename Test to Index