Ports changes to models and model tests along with some settings changes from feature/tracks_activation