Fix eunit tests