Merge fixes for test running.