Fix for checkstyle warning, as well as more code coverage in unit tests.  Cheating a little as I only added some negative cases (so got a lot of code coverage)....but still have a lot of todo notes for additional tests to add for statistic tracker
Merge branch 'master' into unstable_staging