More test selectivity; all tests pass on 8.3 and up.