refactor and update tests for change in requirements
refactor and update tests for change in requirements

thecartercenter/elmo,nmckahd/AHDBurundi,thecartercenter/elmo,thecartercenter/elmo,VIP-eDemocracy/elmo,nmckahd/AHDBurundi,VIP-eDemocracy/elmo,CoolestNerdIII/elmo,nmckahd/AHDBurundi,CoolestNerdIII/elmo,VIP-eDemocracy/elmo,CoolestNerdIII/elmo