emfplus: re-work and cleanup unit test

Change-Id: I484331c4dd5feedf8587530912bb65556c1689c0