Fix tests for 1.4