More tests.
Saving current work towards get/set states.
Cleanup.