* Updated nz_error tests
* Minor fixes