added model tests
cleaned up clutter
Merge pull request #24 from inoda/test-refactoring

Test refactoring