Changes to get proper to work with eunit with coverage turned on.