fix raw import
fix spki tests