Added parameterized tests