Stop buzzy errors from embeded shell functions
Fix test which has broken by 2060c43387d452a00d2aed0f094fc8e248bdb0db