Merged in cursor stream work, reintroduced transfrom to work around node issue, fixed tests #1137