Move to 'enb-bem'; generation updates
Modify tests