Fix test doc dev

Rebases #277, fixes paths and minor tidyup for developers' testing.