added tests, corrected condition for Tau_nad_xx