NXIO-132: some cleanup; fix tests