Unit test updates - Result set changes.  Test_parser changes.

Will this one work?