fix failing gttestdata tests

these changes require a new gttestdata as well, please pull.