renaming/reorganizing tests