upgraded versions, assertJ instead of fest-assertions