Clefs in early music

I edit early music. I setup my score using the clefs indicated in the source eg Soprano clef, Alto clef Tenor clef etc.
When I come to edit my score for modern use by updating the clefs there are no issues with Alto and Soprano clefs but Tenor clefs refuse to rewrite correctly into the Octava Treble clef they appear an octave lower. I haven’t found a way around this as yet. Any help would be appreciated.

There are two different settings, they interfere with each other:

The “instrument” itself

And the clef Notation Option

The epic saga is recorded here:

Thank you so much Stefan for such a speedy response! I thought I was missing something, and I was!!! So much to learn about Dorico.

Thank you Ben for another quick response. This must be amongst the most responsive forums on the web!!!