Use new scheme for identifying notebooks.
Fix tests.