Added main and test models