[ticket/9040] Minor cleanup in the unit test file