Jerry,

I am not sure how this fits with your NATEF program, but my first thoughts are:

1. Replace rivots with bolts and students go through the whole removal and refit process. Use a seperate activity to see if they are competent at removing a rivot. Maybe... Login to read more.