Update data and tests