Worked a bit on unit testing, also used a JSON Generator to generate a bunch more realistic dummy data