Improved hack for gaiatest.
Merge pull request #273 from roydude/v1-train

Improved hack for gaiatest.