CA verification cleanup and test additions