Merge "Add missing import of 'subunit' in test-requirements.txt"