fixed a couple junit tests