Bug solved.
Test generator added.
References in tests fixed. Bug solved from SURF extraction.