Added tests for conditional transitions and overriding scope