add more model tests and model changes