moved over model tests