Fix Junit + Clean mock implementation