Ad/ssh expand test

Patch submitted by alex.demidenko@gmail.com.
pull request created to automate testing and integration