Added tests and minor changes
Transitions are back