Removed JSON processing and fixed tests