refactor to remove TDD_Session use