Improve generic param tests