fixed more junit tests