Minor fixes for testing harness