Added models
Added tests