Merge "More tests for ActiveRestoreSession"