Schema updates for new cuttlefish API. unit test.