Fix tests for non-2.7