add some logging to debug test errors
sonar cleanups