Extend tests for RT #113904