Fixed the tester script for the new data model; fixed a number of data bugs that were exposed by the tester script