Starting to add tests around per player transitions.
All tests should be in place for implementing player specific transitions.
Cleand up some of the tests.
fix merge conflicts
merging