Making thrift tests use the correct test suite. Upgrading primary key to a unique ID