Added timeout flag to test so that it doesn't timeout on cold start
Added support for a special message type (notification)