Move saveState into State class, start adding tests