Fix; tests are passed
Merge branch 'respondable_states'