Fix broken spec, add new for CoreBundle state machine callbacks
Some additional CS fixes