@arcturus @aymanmaat I absolutely appreciate the numbered breakdown of cases to handle, but I don't see any tests in this PR that support those cases.