tidy renameTyVars
edits tests