[fix] cosmetic fixes, compilation works under gradle , but test unit fails #fw_core-51 comment