Better parsing and new test script.
Updated data with the latest posted set.