Clean up test module test runner and fix misc Finder bugs.