Merge pull request #977 from tkafalas/feature

Junit test fixes.  Should fix all remaining in Repository except for
Fix bad class on junit test fix commit