Introduce string interpolation and verify tests still pass