Textindexing unit test.
Increased default timeout.
 Added option for running simple tests only.
 Various clean up.