functional testing
conflict resolution
Merge pull request #10 from nairys/moar_model_testing

Moar model testing