one more try to fix tests