Cleanup inputs/outputs test and expand coverage.