Adding more tests, especially for chrooted sessions.
Merge branch 'rename-max-count'