fix: resolve open issues #349, #355, #392 with regression tests

fix: resolve open issues #349, #355, #392 with regression tests #419