Finish inference and add a unit test
Fixed various python 2-3 issues
Another py2-3 bug fix
Still more py2-3
Renamed unit-test package for the model package to model_test to avoid name conflicts in imports