Updated tests to use FileIO