Remove workaround for parametric test weirdness