Added models and model tests