Adding spec for Runner, other improvements

- Changing how dependency injection is handled