More tests for io.
Cosmetic changes
Clean up