Quickly fix tests