fixing eunit tests - w.i.p.