Reorganized everything to run from unified test runner script.: