Fix some tests for version 2.1.