Updated NEST, Fixed tests