Fix echo policy; fix tests