Reorganize and rename tests