Add Host substitution tests