Update misc tests to assertj and annotate Feature