Fix up Tests and update JSON