Fix some test code to not mangle stacktraces, to make it easier to debug errors.