Fix a few test cases

Commit 6bed45d6fb7c080ae5c163c12b4eb8749a3492ac switched detection
code to use libmagic, which somehow caused failures on testcases.
This will fix a few test case failures.
remove unused macro
minor upate
Merge branch 'fix-tests' into cache-in-sqlite

Conflicts:
	src/detector.c