Unblocking and various tests.
Merge pull request #191 from roydude/v1-train

Unblocking and various tests.