#390: DyRepoTest using mock classes
#390: Fix after review.
Merge remote branch 'fork/390'