fix test failure, organize code, add new compile error

44d8d654a0Andrew Kelley committed on 2/5/2018, 2:26:39 PMparentec59f76
17 files changedLine totals unavailable