Updated tests to use new file locations.