another try to fix tests