update petstore sample json
re-org test json
draft of new primitives system