re-wired transitions
updated tests