Extend duration test, and duplicate some stuff so it replies both to private and to general queries
Authored by: dannybackx 2018-09-02
Parent: [r82]
Child: [r84]
