modify ssh bundle and unit-test architecture