Improve eunit tests