Fix test utils cleanup