- separated ModelService tests to client & server specific test-cases
Merge remote-tracking branch 'origin/master'