assertj instead of FEST, updated Spring librarires to newest versions