all junit tests fixed and passed