Update to latest data and fix tests accordingly.