Added smarter notify support
Removed test stream processing