WIP fixing update and add test cases with version for issue #49