Fix authorities, change test packages