Avoid having to fix tests