Updated models and tests