Fix issues and add tests
Add some code for future Version method