notification cleanup and start testing...