Feature/json discovery response

### Description
Discovery response very close to the short format we want.

### Code Coverage
At 100% for all related to discovery, both XML and JSON