refactoring: more assertj instead of junit assert