new site model test cases
conflict resolved