A separate spec for the fingerprinter change would be okay too but I won't hold this PR for it.