Preserve return value from test runner.
Fix module resolution.

This worked in 1.9.3-p327, but seems to not work under 1.9.3-p429.