additional fixes and test adjustments to make tests pass, related to changes to FTI team vs. workspace in 'team' profile from commit 67270e4e162258d73cac629a08f4a184178658cb