cleanup of conflict aftermath and one test addition
Merge pull request #7 from jojo89/few_more_model_test

cleanup of conflict aftermath and one test addition