HHH-2403 - Test cleanup
(cherry picked from commit 35bd192556ba9318a96f9374a2dfb1557e5a1fb2)