Fix tests
Add pre-330 input/output support