Removed some old code. Update test runner.