Bug 26506: (QA follow-up) Add Unit Test