[WIP] WIP address feedback on module consolidation and test improvements#230

Copilot wants to merge 2 commits intodevelophtilly/SlackONOS:developfrom

copilot/sub-pr-229htilly/SlackONOS:copilot/sub-pr-229Copy head branch name to clipboard