I have finished work on the tests too. Please find attached the updated
patch.