Improved expectedfilenames; but 100% sure it is better though

Change-Id: Iefbff507241ca8244e436b034fe574056e5b862f