Fix + Test for parametric types with multiple type parameters (wasn't comma delimited before)