Hello Robert,
I have created new patch and sent. Please add that to in dunfell branch.
This patch 0001-Port-gentest.py-to-Python-3.patch should not be removed. Sorry for that.