Fix comments.
Rename test guard entity.