Puts out reasonable looking index lines
Clean swhitespace
Adding --index arg
Use subtests to help narrow down failures
Merge branch 'dev' into indexed
handle --index