minor changes to correct the junit tests