Remove echos and update tests