Issue #915 Address PR feedback: Make unit tests easier to follow
Issue #915 Address PR feedback: Make unit tests easier to follow

pg-irc/pathways-frontend,pg-irc/pathways-frontend,pg-irc/pathways-frontend,pg-irc/pathways-frontend