Update data and fix unit tests