Updated Files session adapter; General clean up; Tests refactoring;