Begin migration to using pytest.mark.parametrize decorator for testing.