updated models and test