Rename type to test_type; remove type from Setup