Added main and test view controllers