comment fixes & formatting
more comment fixes
Fix eNotice
fix function to be static, comment fixes
Merge pull request #2978 from eileenmcnaughton/tests

Tests