Bring the narrative test suite closer to complete