Add test coverage
Improve JSON - separate clients from tests