NXIO-142: Fix tests