#117 Adding tests and re structuring code

[pfwd]

Standards checklist:

• The PR title is descriptive.
• The PR doesn't replicate another PR which is already open.
• I have read the contribution guide and followed all the instructions.
• The code is mine or it's from somewhere with an MIT-compatible license.
• The code is efficient, to the best of my ability, and does not waste computer resources.
• The code is stable and I have tested it myself, to the best of my abilities.

GitHub issues fixed:

• Fixes Investigate what integrations tests are needed for the JSONServer #117

Other comments:

...