Move session hack in router to _load method, fix session tests