Finish up repairing tests from model changes.