Finished multiple tracks. Fixed up some of the regression test code.