Improved files test