Fix string interpolation, jiggle format a touch.
Fix a pending test.