Adding more scaffolding, fixing test runner.