fixed a test
Better handling of fingerprint
merged with latest