Reorganize test cases to use subject pattern.