Bugfixes to OED to match recent utility funtion refactor

Recent changes we made to the utility function interface broke some of the OED modules. The current commits in the branch fix that and add tests to catch it in the future. Not deleting the branch once finished since the refactor job isn't completed; but these changes are necessary for other branches.