no cleanup
Fixed tests
Fixed find-references