Remove reserved xhv handling from 1.1
Add utility to limit tests by index