Test and fix File reusability issues

See issue #214 for details