-Fix of junit tests