More general testing and moving things around.
Add echo tests.