ripped out all modeldat2 tests