Style.
For easier debugging.
Fixed tests which got broken in the past.