Another set of test renamings