Simplified echo test code.
Merge pull request #9 from schlamar/simplified

Simplified echo test code