Fix some unit test regressions after utility class changes.  Add unit test for analyzing data linked to encounters of each type.