Add missing 'apply-in-underlying-scheme' definition and add TEST