Fix default notebook handling & add tests for notebook handling