Fix '***' output
Fix corner case with last commit & adapt tests for the new output
layout.