Echo test and fixes