Improve scope tests
Tidy up and document remaining runtime configuration