renaming some tests to be better organized