Fix logic with the test, rollback the async notification after #894