integrate in FileAccess and new tests