Updated tests, counts reflect new data files.
Added simple utility class for searching and editing config files.