updated models and tests