Reimplement context insensitive state machine using @ContextInsensitive annotation;
Deprecated previous implementation artifacts
update test case a little bit