models and tests updated