ADD: Update post from bitbucket and test cases