Update data and fix tests