Moving day

- Moved stuff around in testing (for better or worse)
- BatchOf now is State (but that's not set in stone yet)