Preparing to fix tests