Update test based on production db change
Merge branch 'fireteam2' into gb_master