Improve the generic param tests