Tests pass with new JSON models
Correct swagger model
Add simple failing and passing tests for JSON model generation