Thrust test sounds fine to me.

For the mid-flight trim changes, you might put them on a 3-position Tx switch so that you don't have to 'fish around' to find them, and also remove the guesswork when returning to normal, full-tank trim...