rename X509 classes to remove X509 and improve some tests