Improved readability of parametric tests
Doing some clean up in parametrized stuff