Updating states / tests for more stuff.