Updated parameterized tests.
Merged master.