Fixes for tests after modifying marketplace update email