move some subtests to their own blocks