Fix shadowed variable in code
Tidy up test code
Tidy up and add xscope probes to modules.