Merge pull request #41 from roydude/v1-train

Removed obsolete self.contacts reference in 6058.
Merge pull request #42 from roydude/v1-train

Added new tests to xref file.
Fixe 6049