Alter test param types for 1.8.7 compatibility