Merge "Migrate unit tests to python3"