Clean up the ExtractMethod refactoring slightly
Add a basic test runner