Updated with notebook test