Update bsi check to look for new domain
Add better support of setting up tools environments