fixed model tests to clean-up after rebase