Fix test cases for NEST