Reorganizing tests and some renaming