Fixing functional tests (py fake has to work with both csv mailset or
old mailset)