Revert to claims for testing