More attempts to fix tests