ME: refactored test; added missing field
ME: added a check for filename in list