RFT: Much renaming in testclasses