initial pass through tests renaming