Minor fixes, unit tests
Bumping version 2.0.0