Updated junit tests