test: replace some exit()s with returns.
6 files changed