Junit test fixes.  Should fix all remaining in Repository except for

two classes.