refactor of keys; DyingStateCtrl tests