[OPTIQ-305] Unit Test Failure on release candidates