Renamed test files to match pervious commit.