rewrite e2eutil / added contact tests