Strip broken test completely and add minor hostname fix for CRM.