fix remaining tests outside of model changes