Fix stupid typo on normal state transition.  add better tests