Add more model tests