fixed problems, more parametric tests