All tests pass, JSON conversions and TSDB Query working