Add test to account for when two UGCs expirations are used
remove un-needed mx usage