Fixes "When closed" test cases