[SHRINKRES-140] Corrected checkstyle issues and covergance error. Compiles but many tests fail.