Update version
Refactoring to prepare for better test suites