Corrected names of some files. Add additional Select test to include index