Fix tests broken by upgrade to Sage 6.4.rc1