Fix the EE code so that it works with the current 'master' branch,
and add a test for high-level EE regression