Minor changes required for running tests