Fixes for pull request on 0.1.0 add global, minor unit tests