Update models and services and add _some_ tests.