Baseline tests working, need to restore connect XML