GBE-444: small changes for test and checkstyle