Cleaned up names of tests and data files