more renaming - must.test.before.tagging ...