Look for M2 env before /usr/local
Confusing method name
Fix tests