MONDRIAN-2229 - changing according to checkstyle
MONDRIAN-2229 - unit tests addition fixing