Moved views folder and fixed all failing tests