Updated Junit tests