Add tests for RT #118581 and RT #118067