Fix tests
Fix dataOut handler