BLK-106 Code review and tests for limit/diagnostic message outputs

Signed-off-by: Oren Leiman <oleiman@neutral.io>