Re-combined expiry and session documents. Tests passing.
Referencing v2.0 Raven nuget packages