Modification for the core IO classes and Tests