[8.x] Improves cleanup in spaces data functional test (#198921)

[8.x] Improves cleanup in spaces data functional test (#198921) #84711