Get echo tests running

Echo now returns a dict with “echo” in it, which allows me to test.  I
also fixed a few things to make the new test work.