[TASK] Accomodate 6.3 branches in unit test