Added models and tests