CRAFTER-233, CRAFTER-177. Improved check style. Fixed unit test and inte...

...gration test issues