Fix tests for 2.1.2