Add test for Files Adapter; Minor changes for tests