Fix issue #207 to hold updates to Transition controller calling and others along with 2 new tests to verify the transition flow, I do not think these tests will go into master.