Herp derp, I suck at writing tests.

Changed a few things to ensure that I get JSON back