updated junit tests