Fixed bugs in echo.  Also added better more inclusive ahot test example with a alternating matrix