Added Controllers, views and test for controllers