Updated to fix tests