Ports changes to models and model tests along with some settings changes from feature/tracks_activation
Merge branch 'feature/new_models' into feature/track_activation