minor fakepublisher tweaks
test cleanup, extract EM stuff to own class