Narrative test battery configured and minor fixes.