Fixing tests for 3.2 and 2.6.