Added views and setup test env