Renaming and splitting tests.