Fix broken Junit tests