Weekly updates

- JSON response documents uses real data
- Updated tests 
- Removed some redundancies in code