Fixes a few tests, and hides some JSON info