Update misc tests to assertj and annotate Feature

Oh right - yes, not yet created.  I wanted to use this so I could easily find all the tests that don't have one, i.e. = 0, so I can add them later.