Added tests, views and models