Added tests for modeloperations

Needed some slight changes in the models..