Test case fixes for serial no
Merge pull request #1618 from nabinhait/v4-hotfix

Test case fixes for serial no