Minor fixes for test runs