parametrized tests + fix