Bringing Json support and some tests back online