Merge "Add tests for ActiveRestoreSession"