Added JSONTypeUtils. Clean Up. Added tests