Passing all model tests
Merge pull request #25 from fiery-skippers-2014/model_test

Passing all model tests