More fiddling with how model verification so that its more similar to the model generation.