Fix tests for 1.3.1 build