qcacmn: Cleanup code related to unit-test framework
A previous unit-test framework change contained some outstanding clean
code issues. Address the issues to ensure cleaner code is maintained.
Change-Id: I4e9f8e98f63e280b4333dec710fd1bd2e37e3fb6
CRs-Fixed: 1073756