Merge "Add session cleanup tests for multi-package sessions (2/n)"