Added models
Added test methods