Expanded slightly on running tests.