Update specs to deal with CP objects rather than hashes.