modified test files to incorporate namechanges