Add (more) tests for RT #109874