Migrate remaining tests over to automated harness