some test clean-up and renaming