Discovered a few issues along the way and refactored accordingly. [#48127729] [bs-22] Add missing unit tests