add test
add test
change Jid to case class