Update cj-testing branch

I would like to update the cj-testing branch for this repo.