Reformatted json response test data, cleaned up some json adapters