Updates that fix tests