Initial implementation of saving state is working (for Behat tests, anyway)
Various cleanup
Experimenting with test mock