Added mock interface, fix tests for 5.3.