Add unit test cases to increase sonar coverage