Moved several items from setUp() to test_run() so theywill report coreectly if they fail.