Added useful unittest
Created big unit test
Made the enricher work
Removed stupid integration test
Simplified the enricher components
Validation is very slow, investigate
Merge remote-tracking branch 'origin/master'