updated both models and tests