improve string interpolation and unit tests