Fix: tests, close