Minor tidying
Revised test stubs
makeScopedLookups non-existant import errors