Improve tests a bit
Added max notification level limit