Fixing formatting and adding TestType.