Fix: tests again, put back old code, but I dont see the difference