die & exit and tests tweaked