Improved files syntax and tests