refactored model declaration
fixed tests
fixed failing tests
Merge pull request #2 from secret-squirrel/models_cleanup

Tests to come later... boooo!