Update script and tests to new data