Bit of cleanup, ensure tests can pass along proper JSON