Fixed unit tests that failed after repo split.
Pushing a commit to test Travis integration.