BF: fixed merge issue between two branches in unit test