removeState returns removed State, also added tests covering removeState()