Junit fixes for release. Changed all static EMF and EM references.