Clarify comment
Fortify unit test
Fortify unit tests
Fortify unit tests
Comment
Merge branch 'master' into feat_protocol