updated models and tests
fixed tests
Merge pull request #22 from sdford/modelUpdates

Model updates