move tests to correct place
more tests for Model.combine