updated tests to work with model changes