Reworking mocks for nsnitro_tests