Fixing the testing on somethings, need to fix notify task