Added patch to fix tests