Fix module detection, and move test files into analysis/targets