Expand and improve File test coverage