Merge "Migrate tests/ to Python 3"