fix typos and use string replacements for working tests; disable broken test for deprecated site.xml update sites, as no longer working

Signed-off-by: nickboldt <nboldt@redhat.com>