I've noticed some potential simplifications related to AssertJ, so here is the PR 🙂

Comment From: snicoll

Thanks @scordio, the extracting with a path is a nice one.