mods to controller/service flow, unit tests