Reorganize notebook with tests