renaming tests so they are better organized