Added Test code to verify that new parsing & old parsing code
Added back in reading raw vals, not to be confused with Set Vals
Add code to read set vals etc