Fix tests for #852