Small fix for ORIGIN_TEST mode