Fixing tests for 3.8.1.