- remove test code
- add type property to json output