Attempt to fix errors during test teardown

Created by  Graham Christensen  on December 8, 2021
OSIBECOEJH25QAXCZ76PY7OTP3STBNWEUC36WRTNYAN3IIJP5ZQQC
Change contents