[CLE/JGO] fix unit test and sonar violations