Add more parameterized tests