Change tests file to represent MVC