Really fix tests