Fixed all tests up to and including model-intest.