Briefing tests
Tidy up test stubs
Fix included script tests