MainTest redone, waiting on parser line number fix from Yoonsung