Fixed parameterized tests to work on Python 2 and 3