Improve test session methods