Merge "Add test for autoFinishing sessions." into oc-dev