fixed failing junit tests