Some additions for running tests.