Cleaned some echo tests