Added in dropdown for test_types
Merge