Unit-test checking cleanup