Fix broken junit tests