Added models and http-mock