Fixed the indenting (and used spaces for indents).  Improved search module testing.

As above.