Merging Kevin's CCDA from JSON generator + basic test