Changes to add another test type.