update state map and tests