Fixes to Session Dependency, Test Refactors, and Prelim Age Support