Sonar fixes, test debugging.