Refs #1525 -- Fix tests for PY3.