Merge "Add some IO tests." into ics-mr1