Added tests to prove two bugs while handling ChoicePoints:
 1. Current state can be set to null if choice final state is null
 2. Simple transitions can be overwritten with ChoicePoints