rewrite: fix unit tests, add extra closed check for 2.6 (not sure why its needed now)