Extend tests for RT #117773