Changes to fix tests