Improved test output comments.
Changes to support 26535
Strengthened hotspot connection etc...
Merge pull request #235 from roydude/v1-train

v1train