More test cases, streamlined runner/main interaction