Rewrite tests to use parametrize
minor: removed obsolete line