Remove dead code.
Refactor default test case and sessions.