Working on ajax data format, and adding tests