Roy - blocked a couple of tests while I figure out what's happening.
Merge pull request #258 from roydude/v1-train

Roy - blocked a couple of tests while I figure out what's happening.