Code cleanup
Add more unittests for models.
Alter a few test datastreams.