renames and edits of tests