[SHRINKRES-140] corrected major checstyle issues and covergance error. C...

...ompiles but many tests fail.