Added main and test model