Make tests a little more sane.

Move this below the set -e ? :)