Issue #56 Probably fix some broken tests. Improve function naming
Issue #56 Probably fix some broken tests. Improve function naming

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