added notify, fixed tests