- modify how class state is tracked here as it seems like things
are a little more crazy under xdist mode
- other test fixes