Hashim Amla back in form after playing well in both Warm-up matches