[FIX] incorrect __exit__ calls in tests
[ADD] forgot a file in previous commit