Update models and tests