Fix maven junit tests errors