Updating test harness stubs to be a little more realistic