Added more model tests