Merge "Add phpunit testcases for Bug 30681"