smcarrera echo V2 - with changes

+ additional changes to failed test (missed semi colon)