I think I've done 21 and 25 before, but I can't remember for certain
My BD test folder is at the yard, but as far as I remember they just included some medium trot and counter canter (including loops back to the track) and then not much different from prelim tests...