Fix failing eunit tests