adapted to current EMF Compare version - actually all tests fail now