Add a test runner. More attempts to make tests more modular.