Adding the testing harness back