BS-10617, remove duplicate junit entry; added assertj
BS-10617, use a factory to avoid XStream initialization