Reorganizing Tests.